Effem: ics-plus branch

Change-Id: I1752cf78a17b6606c882149103ed01b8199b1335