am a599eb9a: Reconcile with ics-mr1-release

* commit 'a599eb9a3a9b20947e01e762ca73d7053a12091a':