Merge "Use flash erase & logical block size for userdata wipe"