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

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