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

Change-Id: I11661809088a59f6827a8b907d59fa886524606e