Deprecate all inconvenient methods

Test: builds fine
Change-Id: I52a26d160cff44b2fa0f3a807d23a6ed586d16ce
2 files changed