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

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