Merge changes from topic "am-4303668227b54beb9c1e82d37d8a8d4c" into oc-dev am: 3216dd21b4
am: 88bfb52c5b

Change-Id: Iaa98f8149175d3b231cb2a30b952fbf0c3908cc7