am 6f236669: am 5cc57c37: Reconcile with ics-mr1-release

* commit '6f2366698eedfa68d5c202b98da763c891d79c47':