Merge "Squash commits of the following patches, cherry-picked from other branch - do not merge." into gingerbread