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

* commit 'b1a1f35522ac14076d79942ccb673ef2d2b4061a':
  Keep LMP from breaking KitKat API