am e4c82550: (-s ours) am d6e9e61c: Merge "Fix bug in passing of context flags and version." into lmp-mr1-dev

* commit 'e4c825507dfcb2559ecf6401d06fa5a7ecc8e721':
  Fix bug in passing of context flags and version.