Merge "Merge commit 'b73a3bd336edc8fa22ba61fb24a17036cbefce76' into manual_merge_b73a3bd336ed" into oc-dev-plus-aosp