Android O Preview Release 1 (OPP1.170223.013)
Merge "Update base test class."