aosp-stable: Change time to time_stamp