Android 7.1.2 release 24
merge in nyc-mr2-release history after reset to nyc-mr2-dev