Merge commit '3822b8b7' into mnc-dev-plus-aosp