[automerger skipped] Merge "Remove common_time code" am: d22857101e am: 3b2ceb3175
am: a1fa1715f8  -s ours

Change-Id: I47c713ea8c3df93a6c2362a5043120fb9fa0d3d8