Merge "Merge "Fix broken robotests." into oc-dr1-dev am: a048e3c03f am: 8bf1f86606" into oc-mr1-dev-plus-aosp
am: 5a85d6039c

Change-Id: I292ed821510027f87b01a21c7cffd8e427318e6b