Merge changes If96c0146,I0d68ad60 into oc-dev am: 5393a0e2d9
am: e1fcf8edd6

Change-Id: I59b73215058df60ad93e59a76f01143c6a935d30