bug: 64077740 Change-Id: I6d36c2394a5ae527026c98c83786009e70b20958 (cherry picked from commit 6e18ccee)