Merge "Merge "Fix broken robotests." into oc-dr1-dev am: a048e3c0 am: 8bf1f866" into oc-mr1-dev-plus-aosp