Reconcile with ics-mr1-release

Change-Id: I9fda103ee8c16f7042b22e0fc6bd09be32f3f194