Bug: 74618869 Change-Id: Icaab9b0caac7942baf08be7d3b924fb3fb5520d5 Signed-off-by: Kyle Tso <kyletso@google.com>