Reconcile with ics-mr1-release

Change-Id: Ie82bdb1fa8cfb9deccdb979ee84ff59fc7a6c2cd