Merge nougat-mr1-cts-dev into master.