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

Change-Id: I1484a5a40152de41cb94614d400f1bbf4ae60538