Merge "Fix broken robotests." into oc-dr1-dev am: a048e3c03f
am: dbb97833c6

Change-Id: I46bbc7f6d9d4f4238a2d528abc88d2a87fd25f74