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

Change-Id: I6db59e1c0262e1fb8fc0c3a6310e97e664364ba7