Fix Android 4.3 Merge (Take 2)