am 28b7084e: am 06afcb06: Reconcile with ics-mr1-release

* commit '28b7084e34b3ea7944eec326e029e0ac9142d150':