Reconcile with ics-mr1-release

Change-Id: I0028533f9c4546b0c74b86d3f9f2e114ddfb7a98