am 8d37f7c1: am 9647bdd9: am 70bbbd32: Merge "More flexible intent extra parsing." into lmp-mr1-dev

* commit '8d37f7c1b28c4e82b3bc961d183c313db16d8333':
  More flexible intent extra parsing.