am 54854d31: Reconcile with ics-mr0-release ics-mr1-release am: 691bc744b0

Original change: undetermined

Change-Id: I0e62b35fcb72afd2ebbdf9da70d94112e49bda3a