Android 7.1.2 Release 13 (N2G47X)
merge in nyc-mr2-release history after reset to ceda4a98bcb08f311ba5744ee95e8754b3b5f219