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