Merge "Fix FDE" into pi-dev
am: b3b1a5eacf

Change-Id: I65d0389a9246a21fb2c876edfc5555f327cdec70