Merge "Remove common_time code"
am: d22857101e

Change-Id: Idc66ba039d7d159830c39f37b80197a0f76fb203