Android 7.1.2 Release 17 (NJH47B)
merge in nyc-mr2-release history after reset to nyc-mr2-dev