Merge commit 'aae1a0ba' into mnc-dev-plus-aosp