Reconcile with ics-mr1-release

Change-Id: I7cb3597995d8f720bb763685253e2c22b4370572