am 50fe425d: am 15d81475: Reconcile with ics-mr1-release

* commit '50fe425d7944ee39cea62d6f0b2e01de7f04709d':