Merge "Fix missing api on kitkat." into lmp-mr1-ub-dev