FDKv2 additional fixes am: 9ab67882ec
am: 259a3c5bd5

Change-Id: Iac5c03364819ea0ef7a91cccfc0b62af0b19b612