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

Original change: undetermined

Change-Id: I776cd5d48869c77edde3b6d2c0697f8601fef1f6