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

* commit '666af89eac3447a367f6df4f4fddd34942902331':