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

Change-Id: I06f2d1af886d01b0cbf3429b5d9e361e4b03fe68