am 330875fd: am 24215999: Reconcile with ics-mr0-release

* commit '330875fdcf830db62a46ceb9bc0e0c3d9f67b775':