Merge "Merge changes from topic 'layer-wp-race' into oc-dev am: a17b14eb am: c35a5e29" into oc-dr1-dev-plus-aosp