Merge changes from topic "am-1155d171-2145-4903-8420-80ecfd6c6b08" into oc-dev
am: d0025407df

Change-Id: I7186be0877b4649e3246a05ea610c7c5ee75e542