Merge "Fix Robotest failed" into rvc-dev am: 143668668b
am: aa528a6a81
am: e3b6e31a83
am: c3dc61ad68
am: 2aa0571e24
Change-Id: I64814cf0cc309f2ef4252b4d4846c0b7bd0db8cd
This commit is contained in: