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

Change-Id: If9f7d923e98f33d346ede4bfe3be622f3742ee90