Merge changes from topic "am-93ef86f6-d908-4917-b503-5ba7fcefcad8" into oc-dev
am: 5667f966e5

Change-Id: Iba9987a2228227107c2870f2a57b4c132e3f6e3e