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

Change-Id: I26d60740cd9afc04529a9fb431786c7829ef84f6