Merge "Fix compatibility with Robolectric."
am: 8845f3212e

Change-Id: I655d3a92182496448ef1a119859b213dfa940eec