Merge changes from topic "am-a72dc847-1338-48a7-a594-f88ad937d23b" into oc-dev am: c6dac7c211 am: 4d529aa6a1
am: 83861ae631

Change-Id: Ibc44fb3679e89db40a36da366f58db9bbc1c4001