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

Change-Id: I3eaad7b03c595122dd2aae9c4101b60dcb72ebfc