Bug: 247633734 Test: Verified with local build Signed-off-by: Rex Lin <rexcylin@google.com> Change-Id: I93d5afc09167e45c307ed131c28ce07d3c671e1a