am 02a3315f: am 9114b85e: Reconcile with ics-mr1-release

* commit '02a3315f9e357d40b6af51b0401f6773e032a2ca':