Merge commit 'c31013768eb4ed052c54df50c398f70f2d7ef36d' into 14542.0.0 BUG=b/222349736 TEST=local BE run RELEASE_NOTE=None Signed-off-by: Rayan Dasoriya <dasoriya@google.com> Change-Id: Ie0b27e4c165dec7db1bcca809d14e859894babe1