Merge "Remove common_time code" am: d22857101e
am: 3b2ceb3175

Change-Id: I91a45fc18dbc51a1be23c589d1af06af9c9421a7