Android 7.1.2 release 10
Merge "Stop being silly."