Sync with upstream ffa3961 (svn revision 360359): am: 05ca3f4d04

Change-Id: I108069a860bedb0edc799f6b1bef61f4c600f94a