am f3936904: am 9b2e9338: Reconcile with ics-mr1-release

* commit 'f3936904eb961b7af5fb0093eed92512b211ed26':