Merge "bootstat: test: add error propagation for fastboot format userdata" am: 7de02203cc
am: a4e1f24322

Change-Id: I50d565b0e4a6bd5e0e8e59d313ef0d2c985666a1