Merge "Fix robotests." into oc-dr1-dev am: b5696a9162
am: 3db8c874f1
-s ours
am: fa13bc052f
-s ours
Change-Id: I00afe04b87a756ba1ba85aa0e3abd28370826dd2
This commit is contained in: