Use NotificationChannels. DO NOT MERGE am: e97112e021
am: b24373d5e4  -s ours

Change-Id: I6877b05714712398e1445646f06f614a588c8a42