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

Change-Id: Ifa350e4e880263f58b6eb5ade4fdee5427fcb08b