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

Change-Id: Iaebdf3b3df14fed81fd8472be5519318d14b4e13