Merge changes from topic "am-dd912fb1-a10b-413b-b531-a015abbbf9e3" into oc-dev am: 37d9749e81
am: b434b0c169

Change-Id: I817b45781ecea994292c346d9e3bd4584e0f2d1f