Test: robotests Bug: 78916709 Change-Id: Id1dfc3b61a80c2e0677472ae84dc7425116825f0
Test: robotests Bug: 78448988 Change-Id: I3040c1103d76c75601e82e3660a2ace202837ec2 Merged-In: I3040c1103d76c75601e82e3660a2ace202837ec2