Remove the dependency on uls.data

Change-Id: I9fa103ee7d338ed8ea2032c82249a47d022d2c90
Merge "Remove the dependency on uls.data"