Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 1a3eaecc7c

Change-Id: I919d5e943ee7307fa17c6c247186a09d2fa8e9a3