Merge "DO NOT MERGE. All untrusted selections must go through builder." into pi-dev