Merge changes from topic "am-4f2d7404-9a6c-4f5f-9d17-25f79c4505ff" into oc-dev am: 8c53c6e4e3
am: a7bdac8d93

Change-Id: Ibd410c3b1fae093a6f946e92ef52de245b52b2f0