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

Change-Id: I2f4bd2785b71d0ea033f4338b47e612ddccedc10