Merge changes Ic4e1a1de,Icfceaa46

* changes:
  fastboot: propagate error for format command
  fs_mgr: overlayfs: resize scratch should it be too small