Merge changes from topic "am-793ae1d1-008c-4cc0-9717-ce9555544b26" into oc-dev am: 6df241a03e am: f0a734dbf0 am: 1439e7aeda
am: 699f97c8a9

Change-Id: I5f13e00ff067fafe5952e1e3eaa7a94389e5f379