am c1cf0488: Reconcile with ics-mr1-release am: 33789dd08c am: a53eef37d9

Original change: undetermined

Change-Id: Id5395534d4c600bcdec228bebb3300af0422a6f5