Reconcile with ics-mr1-release

Change-Id: I5bf77ac8b8c77cf7a075c6f0ffa99fa696ce13d3