Reconcile with ics-mr1-release

Change-Id: Icbfa322624551425fadedb6a41a3a4d339e6ff52