am afae108e: Reconcile with ics-mr1-release

* commit 'afae108e09c13c557beee12440cea6345bff924f':