Backported flexform patch by Stefan Schuler

Change-Id: If810d5ad616e199193781041cfdef1d162a4fb0f