Merge "Sync with upstream up to revision 55bd3d128891:"