Bug: 78347031 Test: robotests in ag/3933037 Change-Id: I4d09c8dd27630caeb5c31a0093350437c676d2fb
7298297007