am 4802f781: am 48aca55f: Reconcile with ics-mr1-release

* commit '4802f78191f0056e184f0c62ffa682866e86decb':