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

Change-Id: I4dca6a3e3f00ca533d2d7027b9665f79a8e58ae1