am 17c01198: am 31b0c687: Reconcile with ics-mr0-release

* commit '17c011985e53e7513c13bc1ed40aa65222dc660a':