Merge "Remove setup specific FP find sensor layout" into nyc-mr1-dev