Android 7.1.2 Release 16 (NJH34C)
Merge "Merge upstream 0.165 SHA '203f0a3'"