Merge changes from topic 'layer-wp-race' into oc-dev am: a17b14eb92
am: f39c08c906

Change-Id: I579414089e7f1f814ed4d8aea94ffe73dd6484f4