Android S Preview 1
Merge "Fix test failures due to bad cast"