Merge changes from topic "am-4c299d62-09ab-4948-bcda-e53d47ce6ee3" into oc-dev am: 82eaf5569b
am: 97806b3b03

Change-Id: Ibe85f2598e0764c7ea10b9ab51bb32752864f523