Merge "Sync with upstream b60894b (svn revision 356657):"