Merge branch \'mnc-ub-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-ub-dev am: 9db863761e
am: 55b64e1de6

* commit '55b64e1de62a1f1cb26e9d6a8ded162d112c59b9':