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