Merge changes from topic "am-e8cf3957-7e41-48c5-b339-2114401da749" into oc-dev am: 568344a776 am: 8b1df08930
am: 87a3e6a26a

Change-Id: I2d975bbb67f6ca2379d64112fd5e2c86f3713c4e