Reconcile with ics-mr1-release

Change-Id: I6d002b3cda46acfe66db3b07a349aac8cb6be003