Merge changes from topic "am-84e9fe64-a976-466c-a8d7-d25febc3ff42" into oc-dev
am: 5b882b9dd7

Change-Id: Ieda6e812da1fb9f3ec55201f606dd4a843f63fd4