Reconcile with ics-mr1-release

Change-Id: Ie324085cae4e8c1a4ac1eab978b9c0b771a13acd