am 095df34d: am 5e9187a3: Merge "Fix "system" resources; more context user work." into jb-mr1-dev

* commit '095df34d5b663c24d353d3e1b79f869cae1c8400':
  Fix "system" resources; more context user work.