Android 5.0.0 release 7
Merge "Fixing typo from previous CL" into ub-now-porkchop