Merge "Fix tests" into rvc-dev am: 6d8e0fed61
am: f08d965b53
am: 1b87244013
am: 627642cc0d
Change-Id: I046f986fa2470ff66eedf5205363f59584cdc5cb
This commit is contained in: