Merge "Sync with upstream 2ccadef (svn revision 360428):" am: 8bc9cb1ca2 am: 2f294595d9 am: 9601c6e26e

Change-Id: I520d787407afc664f3c3767ec0e0942e5d40dd20