Merge changes I60250d10,I08effe32 into oc-mr1-dev
am: 8e5c465ee7  -s ours

Change-Id: I276d8de23c878967213854b11e3a143764efb1ea