am 388ce5d3: Reconcile with ics-mr0-release

* commit '388ce5d3ca6903d6a6111c62ff8f392299c34c19':