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