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

Change-Id: I62028bca21ddcb1cdd2f9574615490c795a8cbd3