am 19222ad5: am 64406699: Reconcile with ics-mr1-release am: 5b04a4566f

Original change: undetermined

Change-Id: I0cc2fed072093498ac6d8e3d76b8bcde95b008bb