Merge changes from topic "am-e66183f9-fddc-442d-99f7-bd853e184fba" into oc-dev
am: 12b4e9b11a

Change-Id: If2be334cae212f0006ce24bf68ee13b5d92749f6