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