Merge "Changed alert window notifications to use single channel" into oc-dev
am: 648e127fcb

Change-Id: I0afd77da2da1c7e14cec98be39bcd595ec69267e