Merge "Remove time_in_state.o from build" am: 1dc90cbfd3 am: b827e50926
am: eeae008175

Change-Id: Iae810cbb3ef0b324de4d0e25051260c0792e76e6