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

Change-Id: Ia422c157a5816385a89a423dc47b0f18b65455c5