Merge "fs_mgr: overlayfs: test: triage data missing after failure flash scratch" am: b5db741383
am: 7d772275c8

Change-Id: Ifd3716ec98b11bf1ae47524c9825f35004de11e9