Bug: 271222994 Test: TH Change-Id: Ic29def9fe85d80c8ef96c9152df7312ecc11be05 Signed-off-by: Jack Wu <wjack@google.com>