Merge "fs_mgr: overlay: suppress noise associated with test mounting scratch partition" am: 0eadef4076
am: 07ab1750dd

Change-Id: I1c3f80cd6d5fb4a73bea8858af2f0f1fc3aa4bea