Updates to follow up with Android 4.4 R1.1