Reconcile with ics-mr1-release

Change-Id: I44fceb59c9d34bae9a631d3169f0bdacd2b16522