Fix issues relate to Android 4.3
Fix issue relate to Android 4.3