Reconcile with ics-mr1-release

Change-Id: If53997c291c7c51332b57f572fbbfc70f7527166