Android 5.0.1 release 1
Merge "Fixing typo from previous CL" into ub-now-porkchop