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