Merge goog/master@c8da37c into stage-aosp-master.
authorXin Li <delphij@google.com>
Thu, 16 Jun 2016 02:58:16 +0000 (19:58 -0700)
committerXin Li <delphij@google.com>
Thu, 16 Jun 2016 02:58:16 +0000 (19:58 -0700)

Trivial merge