Merge "Add Flags.DISABLE_FSI" into tm-qpr-dev