Merge "Teach the mount command in init to not consider a wiped partition to be encrypted."