Merge \"Fixed a bug with a legacy notification API\" into nyc-dev
am: 05e19bba37

Change-Id: If9bd17e99ba4665f49f873bf01e0d1db01d49f54