Reconcile with ics-mr0-release ics-mr1-release am: 20ca0d4cf0 am: 1af2ae0ad6

Original change: undetermined

Change-Id: Ieb115180e40231c90928abf631ab2a75bd8084ee