Merge changes from topic "am-c9e7b840dd89496cad321d7c52b28826" into oc-dev am: 31e502e108 am: 39d8d29243
am: 692842b551

Change-Id: Ib803db4ca3443b04ae257c018f55a6b6bd03ca1b