Reconcile with ics-mr1-release

Change-Id: Ie559363abe963201d622a17caae6827d8a22e44e