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

Original change: undetermined

Change-Id: I2c71e0e527f62888ec0cee783c33860c317818c4