Merge commit 'eb9533febd01cde88ea23e2b4fc7fa35efb086ab' into HEAD
authorXin Li <delphij@google.com>
Mon, 13 Nov 2017 22:35:23 +0000 (14:35 -0800)
committerXin Li <delphij@google.com>
Mon, 13 Nov 2017 22:35:23 +0000 (14:35 -0800)
Change-Id: If7b754ce356073d0bfedca11e361c781f48b2c45


Trivial merge