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

Change-Id: I9234764805e70a2e812520f0b02fa63fd4e70580