Merge "Fix FDE" into pi-dev
am: 729ebf23ab

Change-Id: Id30fd6b9a679e432966e8a19018d3466cd74726e