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

* commit 'ae2a8ef527e79349f1ebd99780c50bb5b9107db8':