Merge changes from topic "am-5969704d-c4c1-4e63-afae-e851b95f3e2b" into oc-dev
am: 5ee2efb484

Change-Id: I03962452c1ff5c3a25ed319e7b32e209f8fab5f4