This was causing a resource conflict in open-source crespo builds Change-Id: I7b683d735c851b830fdbab90c78096736ca4f5dd