Merge "FTL: Remove libutils dependency of Flags" into tm-dev