am 55a1c40f: am 85cb9dec: Merge "docs: fix bug 5990526" into ics-mr1

* commit '55a1c40fa0f127b442a2e7f0677a3181e28b6ec2':