Bug: 360874465 Change-Id: I0be4733374bc2769fdb6091168b49b4b12edddc9 Signed-off-by: Darren Chang <chihsheng@google.com>