Merge branch \'mnc-ub-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-ub-dev am: 899d016e89
am: 22e23d1dd4

* commit '22e23d1dd475f46fd1129642bdfe1e0275a6d4f0':