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

Change-Id: I86f11356a2fe6a890f78b7878769e1dd28c2ea40