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

Change-Id: I9702562624983fc18ffccb5f3b40da55f0f0bb0b