tree 3bf9e11fcaae3163d0e330eb7f9a0687d096fd80
parent 490016cfdf71d5339458b9dc1bb5a41b60a03914
author Ben Lin <linben@google.com> 1461195719 -0700
committer Ben Lin <linben@google.com> 1461258706 +0000

Reverting 26160443 to fix new bug (old bug no longer reproducible).

Bug: 27790638
Change-Id: I5d442d5162769c9fd022ab706cc0dd1a505c7fad
(cherry picked from commit e590d9139fa5156214f3b137db8afb90efe60a19)