Merge changes from topic "am-3142fca9-100b-4dd4-8848-117761166ffe" into oc-dev am: a86ba9b6e5
am: 7c05674594

Change-Id: I8da971740edb6e110fc02bc5ae4e92a3072b3637