Merge "Update base test class." am: 4d094d4794 am: d43f9fb8e5
am: 82dd83858c

Change-Id: I1622a149ce2c2c28db211afa105dea6519b59a8b