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

Change-Id: I1318a1ea96f5652309dd481ea8b59ce54c95668d