Merge "Properly use versioned interfaces."
am: 9572afce76

Change-Id: Id7ae85343cd1c57982346ec54b01453ce16f32f9