Consolidate with gecko_ics from codeaurora