Merge commit '39be59fe862bf03fe5f798d784af4870cac21c00' into 14542.0.0

BUG=b/222349736
TEST=local BE run
RELEASE_NOTE=None

Signed-off-by: Rayan Dasoriya <dasoriya@google.com>
Change-Id: I3d7bae64a0d7c579b895a4d5c142dbafd3742985