DO NOT MERGE into any branch that uses the new interface Change-Id: Id54308a89327e69a389ac5916c052ad97f57cb28