Merge \"Merge \\\"Fixed a bug with a legacy notification API\\\" into nyc-dev...
Merge \"Merge \\\"Fixed a bug with a legacy notification API\\\" into nyc-dev am: 05e19bba am: 1eb9ae92\" into nyc-mr1-dev-plus-aosp
am: 6b93bbad
Change-Id: I26cc1e43f6a45a7070a39bce55d588d10da52961