am 36d8b3ea: Merge "Set the file timestamp using the device info."

* commit '36d8b3eafd8b315e79e84d4e7f8cfc40afc3a255':