Merge "Fix notification_alert logging" into oc-dev am: d82a04664c
am: 5bba09f0c0

Change-Id: Idffbcfca36045d886bd05d5d385676cd8d624db9