Android N Preview 4 (NPD56N)
Merge "Fix shift that is out of range."