Fix mergeupstream for ics-plus

Upstream branch is ics
Our branch is ics-plus

Change-Id: Ic276cf1d32208a39a9da81d6351e10eb7d82265b