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

Change-Id: I41473c66c564c41ade775311ebde41b3c253a467