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

Change-Id: I38f6349a440fb068af4a6382c11b0914e30e6047