Merge remote-tracking branch 'gen/ics-plus'

Change-Id: Ida40d8f79446b423f4ec21ddf07dafce719ea104