Inline deprected code in deprecated class

Change-Id: I24440873774a50ac7a28d9560cfff0f390ea2266
Merge "Inline deprected code in deprecated class"