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

Change-Id: I830a26849c8ee515d9117d2ada000a22005b5dfb