Reconcile with ics-mr1-release

Change-Id: I298ee044e83510a9caa19f51e94567863861a8a0