am 17680510: am 7967e4c0: Reconcile with ics-mr1-release

* commit '176805101c10d44f21a65402c9926922b20e1de0':