Merge "Return DEAD_OBJECT if getTimestamp cannot restore track" into mnc-dev