Merge "Keep LMP from breaking KitKat API" into lmp-dev