am bc1de01f: Reconcile with ics-mr1-release

* commit 'bc1de01fe96daaad2573f04faa7e499b24da760f':