These were deprecated in Kilo: 49192695423b949be0e914dee47695db30636280 Change-Id: I8a5f9db5ad951288ec99d0f6c7adfa5fb675e289