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