merge in nougat-cts-release history after reset to nougat-cts-dev