Android 7.1.2 release 10
merge in nyc-mr2-release history after reset to 685b7f70a3c47f5b192e3f7478f0cd289ea6bbf8