Android 7.1.2 release 9
merge in nyc-mr2-release history after reset to f1bc21c734d1bef1ee65f687d0989ee7e6085a08