Merge "Fix Robotest failed" into rvc-dev am: 143668668b
am: 0e750e6e75
am: 9c2709729d
am: db07eabe71
Change-Id: Ieec98fb80d95027363cb7b295b3ccecf25b2e2fa
This commit is contained in: