Merge "Merge commit 'b73a3bd3' into manual_merge_b73a3bd336ed" into oc-dev-plus-aosp am: 16817656 Change-Id: I627e6c413eb09ae9ded4ae1322161dbf7be4241e