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

Change-Id: I4142d7ae2b18be77bf317e282cae7692a37e1cc0