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

Change-Id: Ifea8e8eb7b6a4874aacb2585b02f1020a5d12fc6