Bug: 339030976 Signed-off-by: Victor Liu <victorliu@google.com> Change-Id: I5032fca546918ecf89cd6327fac42d33731cbc5e