I have implemented the logic from this class directly in ProjectApi to remove overhead Change-Id: I0a79a3095ccfb0dbbf288355d084b008e82d7696