Merge "Sync to internal master" am: 6f2b0c6d0b
am: 709e152c8e

Change-Id: I9e817a4f455a40a9b85ef493ac5638f8d6c2e87b