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

Change-Id: I35b3b811fed79b3aafef063df907dddcdc736ecd