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

* commit '15674b917ef505de8bb64c765a21fbe679f79f6b':
  Keep LMP from breaking KitKat API