Back ported trunk to kitkat mr1.1