Reconcile with ics-mr1-release

Change-Id: I55bd573a2b8dabff0c06bb67ffd3472db900d429