Merge "Make sure encryption type is set on first boot" into nyc-dev