Merge changes I6620c996,I094c2cb0 into oc-mr1-dev am: 27e56723de  -s ours
am: 7b034eb0a1

Change-Id: I14fa6165aae4be0e61b3ad3240c0f741412ebefa