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

Change-Id: I9b44f5266027d53790e55437ad73a06430aee40e