Merge "Sync with upstream ffa3961 (svn revision 360359):" am: 2282fc83db

Change-Id: I646f7e98195ac608968fc7370a361f40002fca84