tree a6f08174febca9ede1c87af2ecb814c17dc52873
parent 7d8e766d6d341e236dd42d0c33091ce4c3fca196
author Jack Yu <jackyu@google.com> 1571855732 -0700
committer Jack Yu <jackyu@google.com> 1573674648 -0800

Code clean up

Test: Manual
Merged-In: I5b3620d1ae807455f3313b1564181f95b1202d46
Change-Id: I5b3620d1ae807455f3313b1564181f95b1202d46
(cherry picked from commit 8cb5d156450958139e29c1280281ec750a00a7e7)