Port to android 4.3.1