Merge changes If30bfa71,Ib8f78967 into oc-dev
am: 1fbefc70df

Change-Id: I077a810a54c33ca97c18912ca6399bcb3552824c