Cleanup Apex E2E-test base class am: 8ebfc34fb8 am: 3ca1acf14b

Original change: undetermined

Change-Id: I928bd0debf007c186815bb2e99929a129fad1870