am 34f1e014: am cbd78651: Reconcile with ics-mr1-release

* commit '34f1e01412c2f35d32181f0b6ad64e35cf63ef0a':