Merge commit 'a5bcc9590a76c2ec0be5a6e8d1db8d8a69d80753' into mnc-dr2-dev-plus-aosp