Merge "More flexible intent extra parsing." into lmp-mr1-dev