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

* commit 'fc7130c91323dd76d4e167901207c1934e91ada1':