Merge "Merge changes from topic 'layer-wp-race' into oc-dev am: a17b14eb92 am: c35a5e29f3" into oc-dr1-dev-plus-aosp
am: 9a5140ee18

Change-Id: I1320ab8128d9e4b239a8ed6bb12661a41d6e25a0