Reconcile with ics-mr1-release

Change-Id: I56d869af62a0a636d28d79507ee46774562dc1a3