Merge "Allow switch to fastbootd when userdata wipe is required" am: 16147d1bd6
am: 20b29bbbbd

Change-Id: Ibbf99302158a72b4f8170bb8fe3fc30db4b78cda