Merge -s ours commit 'f8f62986b4' into mnc-dr2-dev-plus-aosp