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

* commit '2a75ecbe9d09eee73a0e11511a8e49e14542ca28':