Also includes a regenerated test-current.txt. bug: 27423298 (cherry picked from commit a1becdc6) Change-Id: Iaa385947af79cee7b0fa1cde10d106411e2f67d2