tree 341dc6790424526b424173dc7bc5a1165db7de10
parent edb5870767fed8712a9b77ef34097209b61ab2db
author Xin Li <delphij@google.com> 1469568174 -0700
committer Xin Li <delphij@google.com> 1471300245 +0000

Merge remote-tracking branch 'goog/upstream-master' into mymerge

BUG: 29834751
Change-Id: I88fc1d4f86bcbd0ac0fe9acdbe764f3d738c5f32
(cherry picked from commit e3d78e1fe0669e9c7083a4de19f1e06171849b28)