Merge changes from topic "am-9b4b0f8c-4823-4712-936a-f4aafe519eff" into oc-dev am: 13ac18d299
am: 585ba6b3ec

Change-Id: I70d1513b0c85f9a31eafe5cb1785e47ab7e29ed9