Merge changes from topic "am-112cbcc3-f81b-4f3a-8186-c071aaa6cec9" into oc-dev am: b75efe5513 -s ours am: 66207d4fe7 -s ours am: 4347d0064e -s ours Change-Id: I5cc395d06038f7d926ef1794eadc9d926bcf531d