Android 7.1.1 Release 31 (N4F26U)
Merge commit vkjson-instance into nyc-dev
am: 2bab539566

Change-Id: I6eab47a354fdb6cd8115165e4ef7dd27a2db48ac