Merge changes I52c156ed,I9fb9a924 into oc-dev
am: e3c0b02d33

Change-Id: I8dd4fb4a04d116ca0d20c8bb69cb36e6a97636eb