Merge remote caf/ics_chocolate

Change-Id: I6ab43973bde65ee5c4c34223ca7e4ccb7f4e8a67