Effem config

Change-Id: I38e9de5ff604b4c5783de2bee0a6c46a723f6a26
9.2.2 FINAL

Change-Id: I470561b97d3d127e09dba9d7fa57b35e35d83688
Merge remote-tracking branch 'gen/ics-plus' into ics-plus