Merge "Update notice" am: 9cf76012aa am: fc01ef6b6d
am: 1360dddff6

Change-Id: Ifeaf13d5c11026a585873382bc47e87af73542db