Merge changes from topic "am-e0cfe15e-bf6b-4acb-83d2-b4cb14a89840" into oc-dev am: 1e9670d87a am: 740bcbf10a
am: 7633a37982

Change-Id: Id9412e0bbfac125430fb0a0b65738366d3b9b16b