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

Original change: undetermined

Change-Id: I58c30e9f8b8eb85fe65d574c8f8ca3f08e681e29