Merge branch 'lmp-mr1-dev' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-dev