Merge changes from topic "am-10d7afb6-3af4-4441-ba2b-ee79a6b00d71" into oc-dev
am: 6351187daf

Change-Id: I5cc99da95e8956d84c0c2ea10f228609510eaf73