Fix Android 4.3 merge (Take 6)