Merge "Mark some TARGET_* inputs as readonly"