Merge "Sync with upstream b60894b (svn revision 356657):" am: 65c509b758 am: fea2464f93 am: 76d5cae72d

Change-Id: I75625e07b9cbcd4552c8caa793069e7da87f95f3