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

Change-Id: I5098e205386b3f25e8bb573115fdec14654d9bdd