DO NOT MERGE: fec: add --padding am: 61fce29c45
am: 867093305e

Change-Id: Ia7d07f7a9c6d62a863b04dcc73914a1398def7b5