Sync with b70287.