Track from new branch ics-copybit_hack

Change-Id: Ibde32372bdac5fd4c64668df1f99822259e619ab