Merge changes from topic "am-c9e7b840dd89496cad321d7c52b28826" into oc-dev am: 31e502e108
am: 39d8d29243

Change-Id: I3dbbcbb002351a6fdb35649c346c7ef20caee0bf