Android 7.1.0 release 4
Merge "Merge upstream 0.165 SHA '203f0a3'"