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

* commit '9db863761e42dd92dbb2be53eeac8e5a9b81c682':