Merge "fs_mgr: overlayfs: fsck scratch filesystem" am: db11fdcca3 am: d56857ce42
am: e634cd70e9

Change-Id: Ia3bf5aaa54cc03191be27d56f8e5f0f10e5b88bd