Merged commit includes the following changes: 175703479 by yifeif: Internal change. PiperOrigin-RevId: 175703479 (This is 1 of the 3 commits in from staging c674e27b)