am a91b32c1: am 113986be: Reconcile with ics-mr1-release

* commit 'a91b32c1d71d8cac75917d35d6263e74916806f6':