Reconcile with ics-mr0-release

Change-Id: I21c521bc9659ba52a8a48a9f142befa418e0896c