Reconcile with ics-mr1-release am: ad8c5483de

Original change: undetermined

Change-Id: Ia8461fca6984558cec52a9cc1ffa2c9e818a304a