Android 7.1.1 Release 59 (5650809)
merge in nyc-mr1-release history after reset to nyc-mr1-dev