Merge changes from topic "am-76a20f08-9212-4001-a52b-dd38a93faa9b" into oc-dev am: 9ede115c2b
am: 43539011e4

Change-Id: I64ee4058dd334bd0be975016361fa97c905a598d