Merge changes from topic "am-1c1ef10f-e9e7-4a5c-940a-9d920d755bb9" into oc-dev am: 403f66c759 am: ef323456fd
am: 8e3ef31ed4

Change-Id: I8ce81bf2114d85af4c2dbd7543e5f6fcd0af3518