Bug: 140882488 Change-Id: I5489a7ce7a8d73306a6ecf69f57d338b2b0eaad2 Signed-off-by: Minchan Kim <minchan@google.com> Signed-off-by: Chenyang Zhong <zhongcy95@gmail.com>