Android 7.1.2 Release 17 (NJH47B)
Merge "Merge upstream 0.165 SHA '203f0a3'"