Merge changes from topic "am-d326b840-2575-4e69-8ec2-5cfa14046328" into oc-dev am: 99e6aa1b1e am: d88c6877da
am: aa55d5db76

Change-Id: If6e65aa957489e085d1a96be0367e158c43ebc5b