Merge changes from topic "am-d375c8a9-01d8-44da-9ef2-2e866e457b89" into oc-dev
am: e936691bfc

Change-Id: I00cd12299a177549e980a01c5e8328306663bbee