Reconcile with ics-mr1-release

Change-Id: I21e41892b352f1deeb7bef163d6b99217bb24a6b