Update to support Android KitKat 4.4