Fixing tests broken by jsharkey in CL https://android-git.corp.google.com/g/#change,29785

Change-Id: I77b08853a5acc79876caffb24eb163f6f0407e57
1 file changed