am cb20fab2: am aac21480: Reconcile with ics-mr1-release

* commit 'cb20fab2ee39cfcb43400b88098b75a8aab4b0e0':