Android CTS 5.0 release 5
Merge "Fixing typo from previous CL" into ub-now-porkchop