Reconcile with ics-mr1-release

Change-Id: Ieb8f41df60861a706cb01b962dddd252c878e532