Modify cuttlefish-related files#2