Merge changes from topic "am-100638f4-8d58-47a0-b84b-5e3b7006a2a7" into oc-dev am: b6ac1f11dd
am: 2b9916c933

Change-Id: If0e7c1c7ba943bfa81c1b7169e24cae51937b581