Merge changes from topic "am-e391c592-eeb3-4cc9-85fd-fa5d3bf694c5" into oc-dev
am: 2833e406e0

Change-Id: Iad49fea0efffc9766797f590b9140cb4bb73a3fd