Merge "Fix encryption on non-default devices" into nyc-dev