Merge commit '9d7657a61c3fb13ae8848f57212e8f887454179f' into 14542.0.0

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

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