Merge "Fix robotests." into oc-dr1-dev am: b5696a9162 -s ours am: c38502ba59 -s ours
am: 7a10210981
Change-Id: I1924c1f0af88e58a0399525fcab4de2b5ed8507b
This commit is contained in: