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

Change-Id: Id3b645350fefaee4071d56d6e4bd368fa535350e