Merge changes I87a57825,I3721d163 into oc-dev
am: e44ea13766

Change-Id: I258fd8dd5fd03975a28c606dcd022ef506554fb6