This reverts commit b7cc955763. Reason for revert: Breaks CopyEfsTest Change-Id: I2522ceeda3f4e77c1102c50a6c0110aca814a4d8 Bug: 376164007
b7cc955763