Merge changes from topic "am-aabaca13-84ab-4de5-bfa1-2add13867c06" into oc-dev am: 3c047ea7fa
am: 3cca4e7b06

Change-Id: Ifaa547b16411e79759647dd9cc53ea76526f5e5d