am afbbe46b: am 66f52a59: Reconcile with ics-mr1-release

* commit 'afbbe46b9f6a46200b0e6518f0450b20e1a7dbac':