Merge "Add java.io.File fields to light grey." into pi-dev