These are no longer used since [1] and can be immediately removed without a deprecation cycle. [1] Ie1dadc6bf935f777e0cd0c54a0a21b79545714c5 Change-Id: I53aa27ff0c3e8a7a2d5bbfa338bdae59002f6e9d