Merge from Nexus 4 related development.
Bump version number.