Merge changes from topic "am-79da5bca-0ca6-42a8-8b95-7ab98d864152" into oc-dev
am: 48dcdf9a78

Change-Id: I6694213e5c47fe1d206a07b0086fb20eef68983e