Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
authorXin Li <delphij@google.com>
Wed, 15 Nov 2017 00:38:11 +0000 (16:38 -0800)
committerXin Li <delphij@google.com>
Wed, 15 Nov 2017 00:38:11 +0000 (16:38 -0800)
Change-Id: Id009d56b13e812cfb7a260469f51d1a9ec3e3dde


Trivial merge