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

Change-Id: I579504e93cc6c21dd13e5b8468d8b87037133a0c