Generate/skip padding and use new prefix for ICS.

BUG=5609007

Change-Id: Ia69fa45e0f728914a4c5de1a531f367dda165dba
2 files changed