Fix up Android 4.3 merge (Take 12)