9576c6fdeb
This reverts commit c945b71929
which caused the unit test command to always exit sucessfully.
Change-Id: I410cbc878675503f0ce6e50bddc4fd0552370c46