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