Merge "Remove dead or unnecessary unit tests" into rvc-dev am: f3b5ba7a98

Change-Id: I0aa32875b0b891c29a037a437d6263923caf7ff4