Merge changes from topic "am-8ebb8a51-8136-4dbf-af20-03fc0d742d1b" into oc-dev
am: 201a7affcb

Change-Id: I36fb048879d94004da8cce63c8cac3e873b67826