Update pbr usage past needing d2to1

Change-Id: Ia5c8dd9259e8098c2ad39eda6fc44c6db81944ad