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

Change-Id: Ia6d8802579ff2f71d015a2a00dbc84d401509675