am 287423bd: am 649302cd: Reconcile with ics-mr1-release

* commit '287423bd7ab04e0c96f5f7c7fbb088d4f7e79170':