Test: manual Fixes: 159638458 Change-Id: I7a90437c12bad57695d6a0d0d1d8bf514cf28c77
Test: robotests Bug: 78448988 Change-Id: I3040c1103d76c75601e82e3660a2ace202837ec2