Merge branch 'master-nova' of persistent-https://googleplex-android.googlesource.com/platform/frameworks/base into master-nova