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