Merge branch 'mnc-ub-dev' of https://googleplex-android.googlesource.com/_direct/platform/system/core into mnc-ub-dev