[automerger skipped] Merge changes from topic "apf-read-ram" am: b5dda0e316 am: 0ec7b1e85e -s ours
am: 7ef34d8629 -s ours
Change-Id: I2ce8a520f0bb744329bb7c9c2782bdbc1f8ace3f
This commit is contained in: