Fix test failures on API 22
am: ce8a02769a

Change-Id: I91553bc878254f78348c738eb5930d38d42fe60d