Fix tests broken by proguard

Bug: 3466915
Change-Id: If506bba3142c7b8fd8ef3a8033693925f51da2ca
2 files changed