Fix robolectric tests

Test: robotests
Change-Id: I0d1ea28b52908838315804bad042a845475368ee
2 files changed