Merge "fs_mgr: overlay: test is alarming on legacy eng builds."
am: 605eab93c6

Change-Id: Ie0fa127f60f388e46f800f716ec3f1a0d286a9af