These were deprecated back in Kilo: caeffad8e71d500a653ac7bc25e4594e624fb481 Change-Id: Ice5464a92f65ff030785e357f65a8680789e3e12