Merge "Remove unused data repository." am: ff2ebb0d7d am: deddd4ddc6
am: 94fcdbe0aa

Change-Id: I2797c145a160819c231e9bfbfa7c65b83c567928