Merge changes from topic "am-99e79364-ab71-4d96-8a34-000c07c66d3e" into oc-dev am: abf0ff542a
am: 4d58eb3bc1

Change-Id: I9bdbdaadbe40bba74e9ca9186e88d6881c25e022