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

Change-Id: I74a742481576df509cf0e08f0ca37d49e94d56f2