[automerger skipped] Merge changes from topic "apf-read-ram" am: b5dda0e316
am: e9c2a1aa3d  -s ours

Change-Id: I8fac093bd2a55d6c59856374fa31d88207fc7623
tree: def23451ca2a13e52a46baf8783b770d3789df93
  1. core/
  2. services/
  3. tests/