Merge changes from topic "am-d375c8a9-01d8-44da-9ef2-2e866e457b89" into oc-dev am: e936691b am: 1ea636fa am: e5eaa05d Change-Id: I02abac786f8297ff2dfc225d3f93f82bd7904016