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

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