Merge changes from topic "am-cfa86bae-47ed-4c92-b3ac-8400ba6eb201" into oc-dev am: 11c37d01f7 am: e72f06b29b
am: b7cd649409

Change-Id: Ia143af5bd7d0428697039726dfe661e40d5b4fab