Bug: 353360211 Flag: EXEMPT bugfix Test: Manual local test. Change-Id: Ie071f0aaf19956f1a472693baf19cbeb0c73b186 Signed-off-by: Super Liu <supercjliu@google.com>