Pie: Android 4.3 compatibility fixes