Merge changes I017c8bd9,I262e75b8,I6584bdf7 into oc-dev
am: e2e0d9cae2  -s ours

Change-Id: I3df5cbaa7e8aa0941b7c8d700a75829fa15adbb7