Android p preview 4
Merge "Remove common_time code"