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

Change-Id: I85a9297a7f03c34698de954579fa24b154d7545f