This way it moves 73 more tests to unit tests Bug: T87781 Change-Id: I963488450bb355573d71ae31b57d71683ce51683