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

Change-Id: Ia0e27fa3249832993bf98e1bb08231f0c5805b8d