am 0517b672: am 31e54ebd: Reconcile with ics-mr1-release

* commit '0517b6721e69d963c3c1dd06b65f5090a34e4b5f':