tree 220b7f8ad4474947325c076d6d67e6fb6894ef23
parent 7b001a133b049f07c1d8777907c094e54b0024a4
author Roberto Perez <robertoalexis@google.com> 1569531717 -0700
committer Roberto Perez <robertoalexis@google.com> 1569533630 -0700

Fix issues migrating to Google3

Bug: 140077022
Test: Manual on emulator
Change-Id: I91dd530b2bfff8e5de3b718d625fd8573952407a