Merge "Add test config to time-unit-tests"
am: f8289b9e88

Change-Id: I9e14a76af68fccc187f2f6adf41b8a08e0a73609