am b207903e: am a32541ee: Reconcile with ics-mr1-release

* commit 'b207903e3d4431778579e89139d807b2e02592ac':