Merge "Stop using junit classes in production"
am: f1ec8df547

Change-Id: If020e58b695e143378fde0bbe804678e74b2c905