am e3804813: am f5f5d61c: Reconcile with ics-mr1-release

* commit 'e380481381b8679bf4bd4afb922e82e0a849b2bb':