Merge "Fix some AppCompacted proto nits post google3 review."