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

* commit '899d016e89daeccd8f1f5b15a5222f801570f283':