Upgrade to ics_chocolate

Change-Id: I3d16814e3c5260fd9810889d41eb05f5db50cff4