DO NOT MERGE: fec: add --padding am: 61fce29c45
am: 8a05232e6a

Change-Id: Ie60d3840f6e6672dab27eb44d90536785eabc2aa