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