Merge "Merge commit 'c621b41e414450b8b1d337e416a95d8f72b98a08' into manual_merge_c621b41e4" into oc-mr1-dev-plus-aosp