am 5974932d: Reconcile with ics-mr1-release

* commit '5974932dae85b553dc7b1598221037f502361fff':