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