Remove direct usage of the deprecated failure location

Internally we should be using the new location and not the
deprecated location wherever possible. This avoids emitting
warnings messages on our own code, which is a dirty habit.

Change-Id: Idac5a772eca7529d92542ada3be1cea092880e25
Merge "Remove direct usage of the deprecated failure location"