[KitKat] Add http://review.chameleonos.org/#/c/2730/