am e6b5466b: am 67cb783f: Reconcile with ics-mr1-release

* commit 'e6b5466b75ef948feb8cd8a220bd41603425196c':