Merge nougat-mr1-cts-dev into master.
authorXin Li <delphij@google.com>
Thu, 26 Jan 2017 18:55:24 +0000 (10:55 -0800)
committerXin Li <delphij@google.com>
Thu, 26 Jan 2017 18:55:24 +0000 (10:55 -0800)

Trivial merge