Merge "Sync with upstream up to revision 55bd3d128891:" am: 8ca792c051 am: e9bcbc39e0
am: 458bc479fd

Change-Id: Ia590b00c215380cde4ee9529fb2a7c0c9e0e54c5