GitLab

Also, removing use of TableMaskFilter (last remaining private api)

Change-Id: I2df80605b240352fdf7ef2ebd26b98342149bda3