Merging Android 4.2.2 code into base - thank you Chad!