Reconcile with ics-mr1-release

Change-Id: Idf831758af6ad25a59d42bdc6f9466eed23e0dd7