am 9f782852: am e113e793: Reconcile with ics-mr1-release

* commit '9f782852900fa02c41f825572bf45bd8bd247852':