Merge nougat-mr1-cts-dev into master. am: 2dcacdbe0a